[SOLARIS] Don't use -nostdinc as it prevents getting stadrg.h

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index fd1a52e365e76a1258f8116a3ec7186d1a2c1c90..fc4241fafb4a8dd6712e4eb60d391ad1be2171ca 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -11,7 +11,12 @@ HAS_VGA  := y
 pae ?= n
 supervisor_mode_kernel ?= n
 
-CFLAGS += -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
+# Solaris grabs stdarg.h and friends from the system include directory.
+ifneq ($(XEN_OS),SunOS)
+CFLAGS += -nostdinc
+endif
+
+CFLAGS += -fno-builtin -fno-common -fno-strict-aliasing
 CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
 CFLAGS += -I$(BASEDIR)/include 
 CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic

diff --git a/xen/include/xen/stdarg.h b/xen/include/xen/stdarg.h
index a9bdaca2565edd3b52bb10cc4386480c6602ec2c..9508bc4df431a279795d247d3367ce61ce7b93d8 100644 (file)
--- a/xen/include/xen/stdarg.h
+++ b/xen/include/xen/stdarg.h
@@ -1,4 +1,4 @@
-#if defined(__OpenBSD__) || defined(__sun__)
+#if defined(__OpenBSD__)
 #  include "/usr/include/stdarg.h"
 #else
 #  include <stdarg.h>